bitkeeper revision 1.138.1.1 (3e747290naA-qNOJaNg13FTUXkrcdw)

further cleanup to domain building scripts

diff --git a/tools/domain_builder/mynewdom b/tools/domain_builder/mynewdom
index 843e603fa90eafd40e108fb8c9d47d1cfc0bad8c..4532e6a7d26933a8d3c747ec1d3a051788826ba1 100755 (executable)
--- a/tools/domain_builder/mynewdom
+++ b/tools/domain_builder/mynewdom
@@ -4,6 +4,10 @@
 
 SIZE=${1:?"size missing"}
 
+SITE_NFS=128.232.32.20
+SITE_GW=128.232.32.1
+SITE_MASK=255.255.240.0
+
 shift;
 
 ARGS="$*"
@@ -26,6 +30,11 @@ LOOKUP=`host $NEWADDR`
 echo $LOOKUP | grep 'domain name pointer' && NEWNAME=`echo $LOOKUP | sed -e 's!.*domain name pointer \([^ ]\+\).$!\1!'`
 echo New IP address : ${NEWADDR}  name : ${NEWNAME}
 
+#SITE_GW=`netstat -rn|while read a b c;do case "$a" in 0.0.0.0)echo "$b";;esac;done`
+
+IP_CONFIG="ip=${NEWADDR}:${SITE_NFS}:${SITE_GW}:${SITE_MASK}:${NEWNAME}:eth0:off"
+echo IP_CONFIG : ${IP_CONFIG}
+
 CMDLINE=`cat /proc/cmdline`
 case $CMDLINE in
 *root=/dev/nfs*)
@@ -48,8 +57,8 @@ esac
 
 echo New root arguments : ${NEWROOT_DEV}
 
-echo ./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${NEWROOT_DEV} ${ARGS}
+echo ./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${IP_CONFIG} ${NEWROOT_DEV} ${EXTRA_ARGS}
 
-./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${NEWROOT_DEV} ${ARGS}
+./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${IP_CONFIG} ${NEWROOT_DEV} ${EXTRA_ARGS}
 
 

diff --git a/tools/domain_builder/newdom b/tools/domain_builder/newdom
index 3b0612638c3d85cb701099f20b08cce954da48ba..196187292314099ea2a5732e9867fd65edc40e2a 100755 (executable)
--- a/tools/domain_builder/newdom
+++ b/tools/domain_builder/newdom
@@ -16,7 +16,7 @@ shift; shift; shift
 
 echo ARGS $*
 
-$DOM_BUILDER $SIZE $IMAGE 1 ro ip=$IP:128.232.32.20:128.232.32.1:255.255.240.0::eth0:off $*
+$DOM_BUILDER $SIZE $IMAGE 1 $*
 DOM=$?
 
 echo DOM= $DOM